merge trunk
authorKenichi Handa <handa@gnu.org>
Thu, 11 Oct 2012 11:29:47 +0000 (20:29 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 11 Oct 2012 11:29:47 +0000 (20:29 +0900)
commit99de36e6c608e9a04fe38968f4a5276374b23aeb
treeadf8e16ab30e1657b7b4718282f1bf927a48742f
parentc0f6bfde7a00a422f55bab2ef7c2c262d0ab33e5
parentca586fcd7c7701a7be4f4464d948ae0b594d13b6
merge trunk
ChangeLog
admin/ChangeLog
lisp/ChangeLog